a44f5cc9a898f17130522250ce7ecb5f8d4d2f08,src/org/archicontribs/database/DBImporter.java,DBImporter,importCanvasModelBlock,#DBModel#,555
Before Change
}
private void importCanvasModelBlock(DBModel _dbModel) throws SQLException {
ResultSet result = DBPlugin.select(db, "SELECT * FROM canvasmodelblock WHERE model = ? AND version = ? ORDER BY parent, rank, indent", _dbModel.getProjectId(), _dbModel.getVersion());
while(result.next()) {
DBObject dbObject = new DBObject(_dbModel, ICanvasFactory.eINSTANCE.createCanvasModelBlock());
dbTabItem.setCountCanvasModelBlocks(++countCanvasModelBlocks);
dbTabItem.setProgressBar(++countTotal);
dbObject.setId(result.getString("id"), _dbModel.getProjectId(),_dbModel.getVersion());
dbObject.setBorderColor(result.getString("bordercolor"));
dbObject.setContent(result.getString("content"));
dbObject.setFillColor(result.getString("fillcolor"));
dbObject.setFont(result.getString("font"));
dbObject.setFontColor(result.getString("fontcolor"));
dbObject.setHintContent(result.getString("hintcontent"));
dbObject.setHintTitle(result.getString("hinttitle"));
dbObject.setImagePath(result.getString("imagepath")); _dbModel.indexImagePath(result.getString("imagepath"));
dbObject.setImagePosition(result.getInt("imageposition"));
dbObject.setLineColor(result.getString("linecolor"));
dbObject.setLineWidth(result.getInt("linewidth"));
dbObject.setName(result.getString("name"));
dbObject.setTextAlignment(result.getInt("textalignment"));
dbObject.setTextPosition(result.getInt("textposition"));
dbObject.setLocked(result.getBoolean("islocked"));
dbObject.setBounds(result.getInt("x"), result.getInt("y"), result.getInt("width"), result.getInt("height"));
_dbModel.indexDBObject(dbObject);
importProperties(dbObject);
_dbModel.declareChild(result.getString("parent"), dbObject);
}
After Change
DBPlugin.debug(DebugLevel.MainMethod, "-Leaving DBImporter.importCanvasModel()");
}
private void importCanvasModelBlock(DBModel _dbModel) throws Exception {
DBPlugin.debug(DebugLevel.MainMethod, "+Entering DBImporter.importCanvasModelBlock()");
ResultSet result;
if ( dbSelectModel.getDbLanguage().equals("SQL") ) {
result = DBPlugin.select(db, "SELECT * FROM canvasmodelblock WHERE model = ? AND version = ? ORDER BY parent, rank, indent",
_dbModel.getProjectId(), _dbModel.getVersion());
} else {
result = DBPlugin.select(db, "MATCH (e:canvasmodelblock)-[:isInModel]->(m:model {model:?, version:?}) RETURN e.id as id, e.bordercolor as bordercolor, e.content as content, e.fillcolor as fillcolor, e.font as font, e.fontcolor as fontcolor, e.hintcontent as hintcontent, e.hinttitle as hinttitle, e.linecolor as linecolor, e.linewidth as linewidth, e.name as name, e.textalignment as textalignment, e.textposition as textposition, e.islocked as islocked, e.imageposition as imageposition, e.imagepath as imagepath, e.x as x, e.y as y, e.width as width, e.height as height, e.parent as parent ORDER BY e.parent, e.rank, e.indent",
_dbModel.getProjectId(), _dbModel.getVersion());
}
while(result.next()) {
DBPlugin.debug(DebugLevel.Variable, "Importing CanvasModelBlock id="+result.getString("id")+" name="+result.getString("name"));
ICanvasModelBlock canvasModelBlock = ICanvasFactory.eINSTANCE.createCanvasModelBlock();
dbTabItem.setCountCanvasModelBlocks(++countCanvasModelBlocks);
dbTabItem.setProgressBar(++countTotal);
canvasModelBlock.setId(DBPlugin.generateId(result.getString("id"), _dbModel.getProjectId(),_dbModel.getVersion()));
canvasModelBlock.setBorderColor(result.getString("bordercolor"));
canvasModelBlock.setContent(result.getString("content"));
canvasModelBlock.setFillColor(result.getString("fillcolor"));
canvasModelBlock.setFont(result.getString("font"));
canvasModelBlock.setFontColor(result.getString("fontcolor"));
canvasModelBlock.setHintContent(result.getString("hintcontent"));
canvasModelBlock.setHintTitle(result.getString("hinttitle"));
canvasModelBlock.setLineColor(result.getString("linecolor"));
canvasModelBlock.setLineWidth(result.getInt("linewidth"));
canvasModelBlock.setName(result.getString("name"));
canvasModelBlock.setTextAlignment(result.getInt("textalignment"));
canvasModelBlock.setTextPosition(result.getInt("textposition"));
canvasModelBlock.setLocked(result.getBoolean("islocked"));
canvasModelBlock.setImagePosition(result.getInt("imageposition"));
canvasModelBlock.setImagePath(result.getString("imagepath"));
_dbModel.indexImagePath(result.getString("imagepath"));
canvasModelBlock.setBounds(result.getInt("x"), result.getInt("y"), result.getInt("width"), result.getInt("height"));
_dbModel.indexEObject(canvasModelBlock);
importObjectProperties(dbModel, canvasModelBlock);
_dbModel.declareChild(result.getString("parent"), canvasModelBlock);
}
result.close();
DBPlugin.debug(DebugLevel.MainMethod, "-Leaving DBImporter.importCanvasModelBlock()");
}
private void importCanvasModelSticky(DBModel _dbModel) throws Exception {